Seems that a proper, a spec compliant solution, might require a bit more work I'm afraid.

I only added one line of code, and the local compilation was fine.
I looked at the logs, there were a lot of logs, but the most important failure was not obvious, I didn't even know where the error was.
Forget it, I gave up on making a PR.
I think it's too much effort. This is not my forte.